From 9f14dd78d85ad8e2d771309851e6a9f72acef7f6 Mon Sep 17 00:00:00 2001 From: "sos22@labyrinth.cl.cam.ac.uk" Date: Wed, 9 Jul 2003 15:39:13 +0000 Subject: [PATCH] bitkeeper revision 1.321 (3f0c3721EPUc_lgxSWz2JlomJJPMtg) Move XenoLinux-specific stuff from hypervisor interface include files to XenoLinux include file. --- .rootkeys | 1 + tools/internal/Makefile | 2 +- tools/internal/xi_build.c | 1 + tools/internal/xi_create.c | 1 + xen/include/hypervisor-ifs/dom0_ops.h | 34 ------------------ .../arch/xeno/drivers/dom0/dom0_core.c | 1 + .../include/asm-xeno/dom0.h | 36 +++++++++++++++++++ 7 files changed, 41 insertions(+), 35 deletions(-) create mode 100644 xenolinux-2.4.21-sparse/include/asm-xeno/dom0.h diff --git a/.rootkeys b/.rootkeys index c3a8b7b201..dca28d4ed4 100644 --- a/.rootkeys +++ b/.rootkeys @@ -539,6 +539,7 @@ 3f05a939_I9vPADPgyVBwUDUxtoeOQ xenolinux-2.4.21-sparse/fs/partitions/xeno.h 3e5a4e66wbeCpsJgVf_U8Jde-CNcsA xenolinux-2.4.21-sparse/include/asm-xeno/bugs.h 3e5a4e66HdSkvIV6SJ1evG_xmTmXHA xenolinux-2.4.21-sparse/include/asm-xeno/desc.h +3f0c3721E5WAnbeoPp7PE35J_Ndxaw xenolinux-2.4.21-sparse/include/asm-xeno/dom0.h 3e5a4e66SYp_UpAVcF8Lc1wa3Qtgzw xenolinux-2.4.21-sparse/include/asm-xeno/fixmap.h 3e5a4e67w_DWgjIJ17Tlossu1LGujQ xenolinux-2.4.21-sparse/include/asm-xeno/highmem.h 3e5a4e67YtcyDLQsShhCfQwPSELfvA xenolinux-2.4.21-sparse/include/asm-xeno/hw_irq.h diff --git a/tools/internal/Makefile b/tools/internal/Makefile index 5f33fdf4cd..c39dcf621b 100644 --- a/tools/internal/Makefile +++ b/tools/internal/Makefile @@ -1,5 +1,5 @@ CC = gcc -CFLAGS = -Wall -I../../xen/include +CFLAGS = -Wall -I../../xen/include -I../../xenolinux-2.4.21-sparse/include XI_CREATE = xi_create XI_START = xi_start XI_STOP = xi_stop diff --git a/tools/internal/xi_build.c b/tools/internal/xi_build.c index c8dfc78786..59c4340db2 100644 --- a/tools/internal/xi_build.c +++ b/tools/internal/xi_build.c @@ -13,6 +13,7 @@ #include #include +#include "asm-xeno/dom0.h" #include "hypervisor-ifs/hypervisor-if.h" #include "dom0_ops.h" #include "dom0_defs.h" diff --git a/tools/internal/xi_create.c b/tools/internal/xi_create.c index 7c3010aff2..ad893285e2 100644 --- a/tools/internal/xi_create.c +++ b/tools/internal/xi_create.c @@ -19,6 +19,7 @@ #include "dom0_ops.h" #include "dom0_defs.h" #include "mem_defs.h" +#include "asm-xeno/dom0.h" /***********************************************************************/ diff --git a/xen/include/hypervisor-ifs/dom0_ops.h b/xen/include/hypervisor-ifs/dom0_ops.h index b6df8bee46..b437acec26 100644 --- a/xen/include/hypervisor-ifs/dom0_ops.h +++ b/xen/include/hypervisor-ifs/dom0_ops.h @@ -112,38 +112,4 @@ typedef struct dom0_op_st } dom0_op_t; #endif -/* These really belong in a Linux header file somewhere. - XXX. -*/ -#define IOCTL_DOM0_CREATEDOMAIN _IOC(_IOC_READ, 'x', 0, sizeof(struct dom0_createdomain_args)) -#define IOCTL_DOM0_MAPDOMMEM _IOC(_IOC_READ, 'x', 1, sizeof(struct dom0_mapdommem_args)) -#define IOCTL_DOM0_UNMAPDOMMEM _IOC(_IOC_READ, 'x', 2, sizeof(struct dom0_unmapdommem_args)) -#define IOCTL_DOM0_DOPGUPDATES _IOC(_IOC_READ, 'x', 3, sizeof(struct dom0_dopgupdates_args)) - -struct dom0_createdomain_args -{ - unsigned int kb_mem; - const char *name; -}; - -struct dom0_mapdommem_args -{ - unsigned int domain; - unsigned start_pfn; - unsigned tot_pages; -}; - -struct dom0_unmapdommem_args -{ - unsigned long vaddr; - unsigned long start_pfn; - unsigned long tot_pages; -}; - -struct dom0_dopgupdates_args -{ - unsigned long pgt_update_arr; - unsigned long num_pgt_updates; -}; - #endif diff --git a/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c b/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c index a792d9047c..a6f03f7caa 100644 --- a/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c +++ b/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c @@ -29,6 +29,7 @@ #include #include #include +#include #include "dom0_ops.h" diff --git a/xenolinux-2.4.21-sparse/include/asm-xeno/dom0.h b/xenolinux-2.4.21-sparse/include/asm-xeno/dom0.h new file mode 100644 index 0000000000..16e5fb396d --- /dev/null +++ b/xenolinux-2.4.21-sparse/include/asm-xeno/dom0.h @@ -0,0 +1,36 @@ +/* IOCTLs used when access /proc/xeno/dom0_cmd. */ +#ifndef __DOM0_H__ +#define __DOM0_H__ + +#define IOCTL_DOM0_CREATEDOMAIN _IOC(_IOC_READ, 'x', 0, sizeof(struct dom0_createdomain_args)) +#define IOCTL_DOM0_MAPDOMMEM _IOC(_IOC_READ, 'x', 1, sizeof(struct dom0_mapdommem_args)) +#define IOCTL_DOM0_UNMAPDOMMEM _IOC(_IOC_READ, 'x', 2, sizeof(struct dom0_unmapdommem_args)) +#define IOCTL_DOM0_DOPGUPDATES _IOC(_IOC_READ, 'x', 3, sizeof(struct dom0_dopgupdates_args)) + +struct dom0_createdomain_args +{ + unsigned int kb_mem; + const char *name; +}; + +struct dom0_mapdommem_args +{ + unsigned int domain; + unsigned start_pfn; + unsigned tot_pages; +}; + +struct dom0_unmapdommem_args +{ + unsigned long vaddr; + unsigned long start_pfn; + unsigned long tot_pages; +}; + +struct dom0_dopgupdates_args +{ + unsigned long pgt_update_arr; + unsigned long num_pgt_updates; +}; + +#endif __DOM0_H__ /* __DOM0_H__ */ -- 2.30.2